Flavour class removed.
Added closing functionality.
Some bugs fixed.