Removed Few Bugs