various fix
more fix