Many many nit fixes