A few more bug fixes before moving onto the last two examples and
implementing exception handling.