minor changes for latest version and content viewer work