Severals Bugs rectified