Removed todos and raised issues on github