more minor bug fixes...