Fixing minor bugs and typos
Cleaning solved TODOs
Fixing typo
Merging