more changes / fixes