bugfix and more help