added tags, minor cleanup