Added some board code, other minor changes