BUG  FIXES EVERYWHERE