Lots of changes, mainly related to python