add: clarify "accept"
add: code cleanups