Add and clean up stuff