fixed all,ready to check