Minor fixes - ranges were wrong in few places causing bad convergence