GDOR & ADSJ fixes, re-add method parsing for now pending better user interface