More docs and environment tweaks