Fix things and make things better