Add anything I forgot + fix derp