more fiddling with tracking
fixing issues