#1: minor language changes