Added a few minor things and moved some parts. /Eskil