more little fixes