Refactoring to clean up spring resource issues.  A few other minor bug
fixes.