CLI works a little better, better JSON serialization