Added comments and one ToDo