More basic changes. Hopefully start up tomorrow make sure I havent broken anything ;P