Fix for GRP and GRPDIR not being reset after entering new WORKSPACE
Re-enabled the commands and cleaned up a bit