Column fitting faster, minor cleanups