bugfix and various