small fixes all ever the place