Updated todos, made comments and added a few new ones