-misc fixes
-added two new tick types