Minor changes to structure, commands and title