Update config.sample and other little changes