fixes and suggestion updates