Remove debuging info, add more todos