Some small fixes for output formatting and param handling