clean up and small changes for new env