BUG FIXES BITCHES