Solve all known bugs in istaken method
several improvement