Various additions and changes.