Small tweaks, update config