Minor Bugs solved