latest fixes for final presentation