Fixed a couple bugs, added things.