Large messy commit of many different things :-/