Bug fixing and Adding Comments