New labels, better gfi handling, map extent limit