Added python3 es

and some fixes