TODO updated; debugging output removed