several changes to fix issues re: feedback