Faster, better tile loading and bug fix to tile matching