added todos
removed debug prints