Various changes (Not very helpfull comment I know, I'll do better next time)