Added Bug fixes in todo file