many little fixes