Changed argument handling for updating and diffing
Refactored help code