adding some little fixes