header spacing and json updates
some reorganization, maybe it's good?