Window, slight tweaks to map and tile

Read the title