added TODO tasks, comments