Made several other adjustments and improvements