some little fixes...