Multiple fixes, resolved review issues, added python binding