some corrections + modifications