Damn it! Posted before doing the second part again...

Edited it in now. I'm tired from vacationing, I apologise x)