I'll be soon after @thedarkhorse review my fixed ups.

There were some issues. Now have fixed it and waiting for approval.