some typos and bugfixes