Changed some comments and the TODO