Fixed/tackled some of the major issues Sonar picked up.
Merged in changes from Chris
Added anti-aliasing
Changed text size and wire thickness