Fixed a few small problems (I think).