Fix & improve config.go