fixed up bug with class based glue, tightened up non-class glue