Minor tweaks and version nr bump