Many changes to remove major errors