Add several commands and fix issues