Fixed Some More Stuff