various things that did not update correctly on previous commits