Boundary penalties almost done