11 fixed issues