Fixed a few small outstanding bugs, including errors if time expires - Issue #20