redid wall uvs and added tile merging