bugfix and updates