forgot a few places needed fixing