#27: minor language changes