O, E and T

I have fixed the O, E and T functions. Also added some other stuff.