edit
cleaned some tags, list them in better order