updated ajax stuff
merge master