first run of general jenny fixes