various fixes done, typos etc.