Tracking Robustness changes and Flkstk variable

Contains updates to hopefully finalize the robustness of tracking and final tidy of the header files.