Copy of elias' weird commit which may be useful or not useful
Little fixes

- bad code line removed (same as in bottomBox branch)
- one for loop decreased a bit
Typo removed
stupid typo fixed
Merge from branch input-class