Add (commented out) versions, tidy up env vars