minor stuff improved