work on #624 (not finished pnr1000a and fadak)
fixes #734