Added /etc/environment and fixed some things