Even more bugfixes and typos