fix syntax and messages