some changes / fixes