Update aug 6

fix two bugs