Various inconsistencies fixed