Add larger epislon for convergence
Fix warnings