fixed issues in device detection
added system tracking