Caption fixes, partition fixes
Caption renamings