Added JOIN statements if needed. Fixed FluentLiterals. Added tests for everything.