a few bug fixes