Some minor changes after the weekly meeting. Some styles changed in the query builder.