various additions and corrections