changed TODOs to fit redesign as Pylearn2