Fixed more broken code, generally my lack of knowledge around go.