Few Bugs removed