added debug, fixed headers
fixed imports, nesting
regenerated