cleaning service scratch codes, and adding a few modules