Extended map, fixed background, added goal