#119: minor language changes