tap() is simplified. Other small comment changes.