Server Argument Handling Updates

Restore server output format
Preserve parameter handling.