add a cleanup function
fixed curreny name / symbol resolution