diff --git a/Makefile b/Makefile
index 5c555f9..48ce867 100644
--- a/Makefile
+++ b/Makefile
@@ -98,7 +98,7 @@
 test-bbr: release-bbr docker-build # @HELP Validate that BBSim and BBR are working together
 	DOCKER_RUN_ARGS="-pon 2 -onu 2" make docker-run
 	sleep 5
-	./$(RELEASE_DIR)/$(RELEASE_BBR_NAME)-linux-amd64 -pon 2 -onu 2
+	./$(RELEASE_DIR)/$(RELEASE_BBR_NAME)-linux-amd64 -pon 2 -onu 2 -logfile tmp.logs
 	docker rm -f bbsim
 
 mod-update: # @HELP Download the dependencies to the vendor folder
diff --git a/VERSION b/VERSION
index 3eefcb9..3f60217 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.0
+1.0.1-dev
diff --git a/cmd/bbr/bbr.go b/cmd/bbr/bbr.go
index 1cd33bc..ad274d9 100644
--- a/cmd/bbr/bbr.go
+++ b/cmd/bbr/bbr.go
@@ -34,6 +34,7 @@
 
 // usage
 func main() {
+
 	config := common.GetBBROpts()
 
 	common.SetLogLevel(log.StandardLogger(), config.BBR.LogLevel, config.BBR.LogCaller)
diff --git a/internal/common/options.go b/internal/common/options.go
index 8505de2..0f14eec 100644
--- a/internal/common/options.go
+++ b/internal/common/options.go
@@ -212,7 +212,7 @@
 
 func readCliParams() *GlobalConfig {
 
-	conf := GlobalConfig{}
+	conf := getDefaultOps()
 
 	configFile := flag.String("config", conf.BBSim.ConfigFile, "Configuration file path")
 	servicesFile := flag.String("services", conf.BBSim.ServiceConfigFile, "Service Configuration file path")
@@ -268,7 +268,7 @@
 		conf.Olt.DeviceId = net.HardwareAddr{0xA, 0xA, 0xA, 0xA, 0xA, byte(conf.Olt.ID)}.String()
 	}
 
-	return &conf
+	return conf
 }
 
 func getDefaultOps() *GlobalConfig {
@@ -375,14 +375,12 @@
 // This is only used by BBR
 func GetBBROpts() BBRCliOptions {
 
-	LoadConfig()
-
 	bbsimIp := flag.String("bbsimIp", "127.0.0.1", "BBSim IP")
 	bbsimPort := flag.String("bbsimPort", "50060", "BBSim Port")
 	bbsimApiPort := flag.String("bbsimApiPort", "50070", "BBSim API Port")
 	logFile := flag.String("logfile", "", "Log to a file")
 
-	flag.Parse()
+	LoadConfig()
 
 	bbrOptions := BBRCliOptions{
 		Config,