More comments, added todos, and removed some leftovers