Bugs

Fixed Some Bugs