A few updates
Changed configurables