Easy to fix when I have the time, what from this point on will be difficult though...

can continue tomorrow