Various updates and additions