bugfixes etc for first release