Lots of Code fixed