Minor syntax bug fixes and comments