Remove unnecessary commented line
Rework field titles
Take two on image handling
Fix missing comma