Progress on fixing basically everything.