some more stuff

TODO: unblock stuff from the blocked queue, bugfixes