major fix, more jquery