make it work

small bugfixes