set ENV and USER + some cleanup