fix failed selector, tidy up files