2.2

major fixes and refactoring (v2.2)