updates and fixes to address JIRA-48