misc changes.  added cg and up