Minor structural improvements. Client side target gui.