added Align, cleanup
refactored output, added plugins, tests