Version bump and some more adjustments