lots o changes ... alerts refactor / got find stop back running again, etc...
A bit more refactoring of services / file names / etc...