Changed some things, added a few new things

In preperation for more usefull and larger updates down the road.

Wow, first time in a long time that I have commited anthing really...