moved misc stuff out of rescue