smoothing incorrect, comment out, few small fixes