removed some todo comments and added on github as issues