Clean up and expose more data.