Remove debug prints, fix paranthesis, add TODOs