fix
fix arrive
fix warnings