advanced targeting and some lof/los fixes