diff --git a/cmd/config/config.go b/cmd/config/config.go
index e2ab447..6f79352 100644
--- a/cmd/config/config.go
+++ b/cmd/config/config.go
@@ -54,7 +54,7 @@ type Pruning struct {
 
 type Global struct {
 	Logging    []LoggingOutletEnum `yaml:"logging"`
-	Monitoring []MonitoringEnum    `yaml:"monitoring"`
+	Monitoring []MonitoringEnum    `yaml:"monitoring,optional"`
 }
 
 type ConnectEnum struct {
@@ -127,10 +127,10 @@ type SyslogLoggingOutlet struct {
 
 type TCPLoggingOutlet struct {
 	LoggingOutletCommon `yaml:",inline"`
-	Address             string        `yaml:"address"` //TODO required
-	Net                 string        `yaml:"net"`     //TODO default tcp
+	Address             string        `yaml:"address"`
+	Net                 string        `yaml:"net,default=tcp"`
 	RetryInterval       time.Duration `yaml:"retry_interval"`
-	TLS                 *TCPLoggingOutletTLS
+	TLS                 *TCPLoggingOutletTLS `yaml:"tls,optional"`
 }
 
 type TCPLoggingOutletTLS struct {
diff --git a/cmd/config/samples/push.yml b/cmd/config/samples/push.yml
index 4d762af..d12c57a 100644
--- a/cmd/config/samples/push.yml
+++ b/cmd/config/samples/push.yml
@@ -18,10 +18,12 @@ jobs:
           count: 10
         - type: grid
           grid: 1x1h(keep=all) | 24x1h | 14x1d
+          keep_bookmarks: all
 
       keep_remote:
         - type: grid
           grid: 1x1h(keep=all) | 24x1h | 35x1d | 6x30d
+          keep_bookmarks: all
 global:
   logging:
     - type: "stdout"
diff --git a/cmd/config/samples/sink.yml b/cmd/config/samples/sink.yml
index 95f4500..f1e550f 100644
--- a/cmd/config/samples/sink.yml
+++ b/cmd/config/samples/sink.yml
@@ -12,6 +12,7 @@ global:
   logging:
     - type: "tcp"
       address: "123.123.123.123:1234"
+      retry_interval: 10s
       tls:
         ca: "ca.pem"
         cert: "cert.pem"