error
Revert "error"

This reverts commit 1117e256e31279827fdf92709422f87cdd320ea6.
A lot of code improvements

Optimized number mode renaming.