fix debug mode & improve it; improve navyhlidce