Updated some minior stuff and made ready for some major chances
hehe