More commands and polishing.