updated tracking and alley code
0.1.7