Various little fixes and typos