argh so hard to fix this :/ still looking at bndry