Fix E resolution
Correct some bugs