rm old fixme
more testing diagnostics