Fixed issues with ! variables bleeding into environment and update to mtut