- solved setInterval-scope-bug
- some refactorings