Fixed various things, broke others