Progress on ObjectViewer Issue #5 and #10