Finish syntax message modifications

All tested to work.