Update tabbing, use utils.locationToString, add some additional comments.