fixed a crap load of errors!