Cleaning up a bit and springifying and showing some more units