Various small changes after Amir review: add/remove command options, use...

Various small changes after Amir review: add/remove command options, use matplotlib 2.2.2 functionalities, fix doc