Add Corki + AntiGapcloser + Little fixes