updated and fixed target fields etc