Some of my changes, especially interested to get the parser fix in

I also have ECLI_BOOLEAN in case you are interested.