fixed syntax / type errors