Moved some stuff around
Added some values which seem default on my personal system