Added some more tiles, cleanup