added three fixes