bugfixing and spellcheck