More fields and more organization of fields (still dont like much stuff...)