Various additions and corrections