simplified some implementations, fixed a few bugs in the original
tracker implementation, it is starting to work...