Lots of broken install stuf that needs cleaning up