Fixed some syntax and usage issues