more bugfixing, no new features