issue 2,5,6 fixed