Small tweaks and further cleaning