bug fixes to user story update
merge fix