more fixes for name bug