minor bugfixes and operativity issues