various markup fixes, remove stray dashes