Some handy adjustments.

Awesome repo. I made some adjustments, please look into the log messages for more info and use what you like.