fixes all around