more use/take fixes