* few fixes.