~ minor adaptions / corrections