Bunch of small fixes
Version upgrade