- Resolved some unintended behavior (mostly inconsistencies in interval numbering)

- Modified query set towards the goal

Still TODO: introducing the disclosure delay (of 2, usualy)