A whole swag of changes to make things work properly and more robustly