Moved some stuff around, indentation in JSON, etc.