Improve function matching

Tweaked function matching function to better capture entire function
block
Revise resources

Improve resource tools
Revise clippings

Refactored and improved clippigns