Fixed Some Bugs #80