markup fixes and serious corrections