a bugfix and more user stuff