some edits + adds for mayhem/hastings