improvement on hand-set parameters, gets rid of phi==0 return values (seemingly) without breaking anything else