Various fixes for direct2experts code closes #15