Wall: add instances for Polar

move some instances around,
remove some imports