added some quips, timeout condition complete
Merge pull request #201 from ebbyw/Ebby

added some quips, timeout condition complete