plenty of small fixes, typos etc.