Edited TODOs, updated README
Added comments and TODOs
Minor TODO addition