Some changes to environment

Also made it a bit easier for me to maintain Arch.