minor renaming and setting higher tap timeout