Fixed a problem where a function was called without a needed parameter. Also fixed bug in native parser that left a trailing \r in the reason. REVIEW FOR PERFORMANCE!