...
Fixed Some bugs :)