Pull in tile loader
Misc cleanup