removed some comments and added two todos