more refactoring and a couple of new binds
temporary fix for go files