Issues 1,2,9 fixed