Polyconseil master

Many little fixes on different purpose.