Made normalizing easier and more accurate.
renaming mode / property stuff
work on touch tracker in progress