Python changes

No breaking changes here, just modifying obvious changes while taking a look.
Feel free to ask if you don't like some changes =)