General improvements and first page field test