syntax bug fixes