Interal improvements and better target handling