Various Modifications

Here are a bunch of small modifications I made to this module. Feel free to cherry-pick any you find useful. Please let me know if you need any changes done on my end. Thanks!