Add confirm steps

Issue #141

This also removes a bunch of misleading references to the 'current environment'