Various changes for your review

Hello, 

Please find the contained pull request which makes various modifications to your module, i hope you like them and consider taking them.