Should be the last of the stylistic changes; did main and text