Fixed a couple more bugs