Added a TODO item
Fixed a regex bug in syntax checking