Removed TODOs
PSO works
2.2 b now works