Re-factored column_segments and other changes