fixed tick-insertion; misc changes

yes