fix
fix
misc modifs
callback implemented