removed ef5 and fixes #23 fixes #22 fixes #21