New bugfix release and some refactoring

Just a bugfix release for when the primary screen doesn't return after a session.

There's also a tiny bit of logging in there now in case of problems (it's just onscreen, no file logging):