Improvements, method adding, AJAX rewrite