Fixed somethings, broke others