Insignificant Bug Fixes

code clean up
rectangles in header fix for the stuff that was 1 pixel off