various fixes to suggestions