ignore env.sh, and tidy up some source