bug and missed fixes