Updated handling of stairs to better handle failure/mishaps