few bug fixes...