bug fixes again

merging didn’t pull in the changes? (probably something with the
conflicts)