cleaned up waitForButton and added ability to skip Zero