Makinhg some corrections