Loads of fixes, test sets all pass again