adding better message to user, and dev option to not change local system during testing