Improve display. Add more functions to help testing.