Mess around with configuration a bit; move over more magic numbers.
Refactor scarbre a bit.