epp almost complete
minor fixes