Some cleanups and fixes

Here are some cleanups and fixes for the master branch. I wanted to change the name of the final module because I was getting mad in openwrt since the package had one name and the module had a different one.

:8ball: