Add some configuration stuff and finish command handling.