Updated a bunch of stuff for EM
Merged