QOL changes

I was looking into this module and i decided to make a few quality of life improvements.
I figured I should port them back