Thanks for working on this. This much fixes should be enough for now, the mod...

Thanks for working on this. This much fixes should be enough for now, the module will require a few more changes and feature additions and then we can revisit coding standards again.