some more bugfixes to answer criteria