Fixing things up a bit, getting ready for a big redesign.