fix changed imports from EEUtils
Change a few other things also... (sorry I don't remember what the changes had been, too long since I made them to now)