many small fixes for test and display