Some bugfixes and a new list command'