Improved list command and minor changes