I fixed all your things you commented including this one