updated to new config, minorly improved interface