Major additions and corrections