Fixed some more bugs...