bugfixes, this thing is now usable again