Bug fixing, alot of it :D more squashed bugs