Dealt with (y-0) factors (hopefully)
Minor changes