ajaxification and some more