Updates

Various updates.