Fixed some more bugs!!