Added pretty tables and cleaned things up.