changed some more ajax, not done yet