Various summary tweaks

NOTE: This hasn't been tested in action!

However, there are no major changes in this, so I reckon it is fairly safe. Will slowly add more here until it is merged.