replace colon and semicolon; minor tweaks