vm options improvement
macro -> codegen
typo correction
log service injection
Unit injectable services
yaml test correction