Use proper fieldtypes for more requests
Clean up a few TODOs.