Fixed some bugs and tidied up board