Matthew -- removed more bugs from tile