lot of bugfixes
version bump