Fix python, general cleanup