Fixing various issues, moving column count back to global config