Some stats tweaks. Simplifying markup. Moving stuff to models.