Fix up small issues
Add fields