add failsafe, update names/docs