NUmerical presision issues partially resolved