updates store worker etc
aggressive refactoring