Slight tweaks to order of dependencies.
Converted single quotes to double quotes.
Fixing the new relationship()-style queries.