+ minor syntax updates