add delete capability, smush a few bugs.