cleaned up columns; modern master adds