ko: bug fix for _raw
ko: some cleanup per @nezda's input