Added column-marker and other tweaks