added target names to target list
moved stuff around a bit