fixed where(:id = blah) to find(blah)
fixed a few non-idiomatic finds
fixed merge issues