Column/overlap fixes
Overflow fix