Fixed TODOs
Fixed TODOs and merged