Updates the PSG variables to create and drop
Closes #749; closes #750