Various updates trying to get things up and running