Various Refactoring, and Bug Fixes. Plus facts can be embedded in enc data