recommendations and bug fixes