Big bug fixes for final presentation