Lots of small tweaks that have been forgotten.