4th phase minor bug changes