Fixed many function parsing problems