Fixed Some More Stuffs