bugfix and minor improvements