Major fixes everywhere