Fix a hard coded tile size that broke tile sizes != 64
A few other cleanups