add - unset RM_STAR_WAIT, change alias for apg