Add a delay + option
- Small option cleanup aswell