fix for "time", "repeat" and other stuff

- i don't exactly remember what i fixed
- it should work fine