fix up hooks and service definitions
fix option type warning
rename for clarity
break out config variables because lists and dicts are not supported