Bug fix in suggested targets, tweaked math