some minor adaptions