Hunted down a few bugs and made a few adjustments.