Simplified some things (for now), and basic hinting on 'other' fields.