Added tap conditions, killed morse mode, misc cleanup and fixup.