fixes #735 epbase seems to have no purpose
43 files changed