added support for go and other minor fixes