Various updates and additional automation