more updates and failsafes