Add more targets plus some other corrections