Hendrik Leppkes:
	- Cleanup text tags a bit more to avoid errors and restore consistency
