indent & some content fixes