Some more corrections and enhancements.