Updated the matching code more.  Also changed the name of Drawstuff to
keypad and keypad to esecure to better represent their purposes.