added check for local submission
just a better output
disentangled everything a bit