Everything (almost) fixed!