Reviewed code, removed fixed TODOs (not fix TODOs are still numerous)
Merge branch 'master' into test_1