Still half-working but better

Everything is finally taking place for v1.4/1.5

I sprinkled 'else if' statements everywhere before it was too late

Now I'll test if it works in the real life... ;p

I still need to fix some border bug