fix syntax and things