Numerous corrections and enhancements