bugfixes - mostly typos