Various updates from Scott