fix: Column counts are accurate above large, other misc. fixes