More optimizing. Also fixed a spellng error.