Fixed markup, some minor improvements.