many fixes + ajax