findOrCreate, misc amends