goal first and goal second bugs fixed and the report issues is resolved as well