fixed comments, added todos