Bugfix and minor improviments