Fixed closing of positions + performance