Corrections

Extensive testing and case respect for suggestions