Various updates for #6