Restructuring, tile size bug fix