Fixed various of things
Fixed various of things