updated outline with changes to Spoofax
small refactoring
fix