Fixed all this stuff

Can you check all this ?