Fixing horrific bugs!