some little bug fixes.