Small tweaks, starting on C4Button.