bugfixes and others