28/08/2013 - Final Tweaks for Demonstration

Final error checks and bug fixes.  Demonstration this afternoon.