numeric check fix, other small fixes