fixed errors with ajax
Merge branch 'ajax_part_two'