cleaned up old comments, added TODOs