general fixes for presentation