fix

21.10.2014 / mocha-disabled + some main small stuff