Adjust default wait time and remove dead code.
Implement skipMessages feature.
Some source code comments.