make some quick bugfixes