Board fix

Take a look, and see if this fixes things for you. I recommend trying this branch out on its own first, and then merging. You might be able to merge automatically on github.