Fixed syntax bugs