various little fixes.