Fix clean to be cleaner
*BUG: doesn't return cleanly

 - inserts some code Slummy suggested for restoring the view properly.
 - still isn't working. I think I'm corrupting something elsewhere.