Add description comments and use full commands and options