Combat Tracker updates

Client side CT changes parallel host ct changes but not fully tested