Fixed syntac issues.

First working copy.