updated more tags, modify minor errors