Make small changes to usage and comments