Fixed issues ... and Added Suggestions