Sample config and minor changes