some big api changes
some bugfixes
many bugfixes
bugfixes