fixes issues found in exploratory
fixed issue in integratoin