adding more commands and fixing things...