Minor touches on syntax / message