bugfixing, added defaults