Bugs Fixed
Some changes