various fixes & typos