Some changes and installing ajax
merging fixes