modify go semantics, ok idiom unnecessary
rename underscored function
argh
more comment fixes