finished some corrections