Cleanup installation and decorate spec with TODO items