Add things and fix broken things