more spinning, and bugfixes