Version up and some tweaks