Tweaking db conf, adding query, builder, db fix