Feature/externals v5

Resolves some issues I found with java parameter handling.