Making output more verbose, adding extraction functions