corrections

made some corrections after test