Minor changes and errors fixed.