Changed tick mode.
Minor improvements