Flatquerybuilder

Quite a bit of updates to the FQB after the project meeting last week, and also a findbug warning resolved (I think).