bugfix and future ideas