Minor fixes
Added live variables equations solving
Pretty-printing improvments. Cosmetic fixes.