more bugfixes and forward compatability changes