1.6 catch up; unknnown handling and spelling corrections