MADE SOME AWESOME FIXES