Add help flag. Misc other changes.