improved doc and display