Make python3 compatible
OCD: Missing space in json layout in docs.
Merge doc changes and script doc changes