typos and little cosmetics bugfixes