better demo + fix reporting of rescue position