some smaller bugfixes