The last point in the OP (single claim is boring) is also being addressed with the claim system.