We are functional again.  Cleaning things up and making things look
pretty