More x, y cleanup and 100 column fixes.