Dave lock released. No major changes, just fixed wording and cleaned things up a bit