Scanning corrections
some corrections
merge