Bump version number and make minor consistency tweaks