correct lib path and add tracking