slight renamings, and added more targets