Fixed a few embarrassing bugs...