Fixed Some More Bugs