Merge "Updates to usage and add directso tag"