bugfixes, added settings