Typos etc. and some minor extensions