More small tweaks to final version