added tags, and minor additions