some quick bugfixes