Add polissoir model
and misc changes