31 fixed issues