added include statements to elliptic stuff
refactored more underscores