Fixed up some more things and rewrote the tileset component somewhat