Fix existing chores bugs

fixes all existing chores bugs