Adjusted some specs, cut down sql queries to ONE on index and ONE on update.