basic markup fixes