did some corrections