adding and fixing various things