More bugfixes + more robust
Deprecated handleIncrement(), replaced by handleIncrementLang()