small fixes
dynamic track