Command line args + goroutine bugfix