big format changes, some content fixes~~