also adjust some areas so they match but also no longer include bits which
aren't too important for offline checking