n´minor changes and bugfixing