tilesets refactor, added blocks