correct laptop hostname, improvements to env_setup