some changes to main.go