Ok ^^ I've done some other minor modifications. I can re-modify them if they don't seem ok.