2 new config values; fixed versioning; clean-up