Tileset and other bug fixes