Changes to target generation and map positioning