Several modifications/refactoring of tc code; debugging of Desugarer/core; update to test cases/journal