a couple of fixes
Configuration is now an explicit JSON