adjustments to command handling and logging