add missing quotes + field declarations