Ajax improvements and more