Set more things from ENV, clean up some complexity