Unbroke things, module improvements