170 save episode 157 render malfunction

ready to go please. I've just re-applied this to today's master so the changes should be pretty clean - for now!

This closes #170 (closed) and closes #157 (closed)