issues-related cukes

issue-related cukes and other smaller updates on other cukes