Add defaults and failsafes

Add default values and return points for values that are not supplied when called