- Small fix on double enter action

- Including the awaiting of our task into the continuation loop.
- Quick refactor of some components.