Some inconsistencies were fixed.