updated inlines, image fields, error handling