misc fixes, correct use of lodash .find