purge work and general fixes
9 files changed