add block names for debugging, fix some for look codegen issues