added a couple todos and go fmt