Version bump, bugfixes