add STABdubs, STABmons and generally clean up with some nitpicks