Fixed some more things, renamed things, added things.