some more minor bug fixes...