Bug fixes.
Remove dependency on FEU
General improvements.