clean up
server and ajax bug fixed