bugfixes etc, almost ready for preview release