Update config
Fix various bugs and conflicts, again