New API and fix to phi bug!

Large overhaul to names of functions, and introduction of new data types to keep code tidy. Fixed longstanding bug in the way phi was computed.