a few minor syntax changes