various changes / fixes