Fixes some bugs
Adds list command