Fixed more formatting, corrected a couple of minor errors