cleaning out TODOs; a few gmm adjustments and cleaning