More (possible final) tweaks, uploading just in case.