Final tweaks and fixes