Refs #89 - Fix various issues.