More tweaks and increased version