LOTS OF FIXES