small changes

- removed 'module' delay
- shortened other delays
- reorganized some code
- ...