Fixed some bugs, but still broken on corner piece