v2.1 and v2.2 commits

changed/fixed a lot, changelong visible in Main.java in core package