update for master, fix deprecations
update to master, fix deprecations
basic support for config / macros