get_target change and other minor things