Bugs fixed and pull request suggestions are solved