* Added todo for bug
* Improved the EFT parsing code. Still not happy with it.