Fixed the final issues that Collin pointed out. Reformatted go code.
Fixed compilation errors stemming from the fact I was assigning the wrong types
in certain places.
In general, should be better.