Updated version number and small tweaks