Updates to user functions - closes #65 and references #71