Friday bug fixes to add questions