Too lazy to add detailed commit message
Fixes and changes made by Pyolem