Added working example, created EFC calc factory, fixed typos