Move stuff around. Minor optimization to list tojson
XML docs
minor