A bunch of syntax fixes -- first working converge