Add some new stuff, fix some old.