Many code fixes and first attempt of AntiKT