fixed the 2 problems ya7ya uploaded