more bugfixes, features, etc.