Finish the whitespace and OTB tweaks