paillechat commits + small changes