Fixed a couple more bugs hopfully