Add configs
Fix some issues