several little fixes