Smallfixes and typos