flob 0023z - tracker fixes & refactoring