Add help text and other minor changes